Bug: 64382372 Bug: 73114663 This reverts commit 8407b4eb. Change-Id: I536a14adeae87790769931fe3a2f217ae1ec0d6b