Bug: 69349963 Bug: 69096589 Bug: 63984327 This reverts commit 993203c7. Change-Id: I52839aa5991541399651904587aa342a858a5915