This reverts commit 5e8c117c. Reason for revert: b/72969557 Bug: 72969557 Bug: 72566647 Change-Id: I05f45f6968c7c4424f677c0ee58b6eb847667e95 (cherry picked from commit cb2749c6)