This reverts commit 4f270f03. Reason for revert: b/127305716 Change-Id: I46a9dba07d0e1b15af78ab185d873a045c0e7423