This reverts commit 620e9157. Reason for revert: b/238985243 Change-Id: I1fc82c61b445b6f5ceedb2ec8b727e8e745f47c9