9fa58b2fee
This reverts commit 0bd0733ef4.
Reason for revert: b/209025715
Bug: 189807374
Change-Id: I477bacc318e84c16f124cf776ddd8446959755aa