This reverts commit 1780cee0fe. Reason for revert: b/240517487 Change-Id: Id0b690ebba880dd9c978ed42c0f965beb2678b8c
1780cee0fe