d7f11d5fb9
This reverts commit a75f576890.
Reason for revert: b/187887269
Bug: 187887269
Change-Id: I8a56ff7054e71cf30b113fdaa213397dae0c53cb