9d8c7871fc
This reverts commit 816ee74a2b.
Reason for revert: b/286278723
Change-Id: I3c4a5756c87a952f52947d2a8d3387396cd0637e