This reverts commit 69a4e713. Reason for revert: b/124450605 Change-Id: I49c47c29e434cc01df231b6430677cfbe5a36811
mentioned in commit a749ac27