Revert "[DO NOT MERGE]"

This reverts commit d0823a77daddae55dde14d72f798fd95cbb04ac6.

Reason for revert: Broke the build: b/195683319

Change-Id: I931793f37df2ddcd6e179f5cc205e1bcec244de9
2 files changed