f9042d32ae
This reverts commit 013a8a75ab.
Reason for revert: Broke builds
Bug: 229619753
Change-Id: Idb1aecf1d43db50aa4f11dbb88079c37e401d694