f4269f01d7
This reverts commit 04658bcd42.
Reason for revert: root cause found
Bug: 260135164
Change-Id: I809662780d042923de015ff4cb810b3da5169f83