00fb1adab4
This reverts commit 114e84908f.
Reason for revert: b/356166053
Change-Id: I30dfbc5da1caecd89b4b23aafe4de8e9efede6a0