This reverts commit 4bb01067. Reason for revert: b/123436620 Change-Id: Ia7595ace4b76abaa99dbb651e7d2f088dec5bad9