This reverts commit 1c17c88002.
Reason for revert: Build broken: b/182721112
Change-Id: Ibc84ec6d7900fdcf0bc14cd7036f9c08287711db
This reverts commit 1c17c88002.
Reason for revert: Build broken: b/182721112
Change-Id: Ibc84ec6d7900fdcf0bc14cd7036f9c08287711db