This reverts commit 0ad17553. Reason for revert: Broken build b/183416288 Change-Id: Id9ec9fb98b8f88eeb7db1d1442d76456aaf350d1