This reverts commit e5f6a8d7. Bug: 151586035 Reason for revert: build break Change-Id: I4ee7366b88e10910c1bc4b1f192f66000d8e40e3