This reverts commit 6e1b16c9fe.
Reason for revert: Broke build of tests: b/178441996
Change-Id: Idaf35fa02f76852fa8134b0d505467007f6d0f60
This reverts commit 6e1b16c9fe.
Reason for revert: Broke build of tests: b/178441996
Change-Id: Idaf35fa02f76852fa8134b0d505467007f6d0f60