This reverts commit 8b5afd93. Reason for revert: b/186367826 Bug: 185301309 Change-Id: I7a68f1a32aff194d68af1c3ef55dc60ffbde5df9