506165689f
This reverts commit 0fd3b13d01.
Reason for revert: b/236514960
Bug: 228137694
Bug: 230373809
Change-Id: Ifed5f2a13fda4409982d548e3212bd16c81b63bc