This reverts commit 77d73605. Reason for revert: b/76088057 Bug: 72029061 Bug: 76088057 Change-Id: Ib1212740bcd5dd0fe8de87521e716c17b93c30cd (cherry picked from commit 46312b39)