Bug: 64382372 Bug: 74963051 Bug: 76162083 This reverts commit 8bb4cfb7. Change-Id: Ifc7046371bdb090c758714cdafe5b89d7cba46f8