This reverts commit 39b02386f7. Reason for revert: b/124450605 Change-Id: I3b2d66c87dc645da0d4e8ded798a1b80381523cf
39b02386f7