This reverts commit 97fc6d9c. Reason for revert: b/132236259 Change-Id: I5270140580ebad16a9dc1db6b2e5f9faa977f54a Bug: 132236259