This reverts commit b1d1e0e6. Reason for revert: b/162063775 Change-Id: Ifcdba9d918d2bd0b5ab7ab02ccdc727a844a5556