This reverts commit e6428b48. Reason for revert: Broke presubmit: b/157231582 Change-Id: I176f9940dfa7bef74cdb450774c7d09c2f6b4007