This reverts commit 13165494. Reason for revert: b/124049413 Change-Id: Iba0cf734ba8d6a16a1ee2930b162760e59a76444