bug: 64382372 Merged-in: I188a69ad05fffa69be79fec36b180fc9f76998fa This reverts commit 43293cfd. Change-Id: I324819bba610426f5ea63077275f792374386b6c