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