This reverts commit 48970b1c. Reason for revert: b/286570856 Change-Id: I6317a93bc8f950e158cda876ed9ecaa61bd4d33a