164b832ec4
This reverts commit d89732ef85.
Reason for revert: b/374080485
Flag: NONE
Change-Id: I56236f539957efaaa4caa30a4b887d017037709f