This reverts commit d74a3b3c. Reason for revert: Broke build(?) Bug: 148225705 Change-Id: I46e4aec3385d178234d3ea609c190b14aca5c8a1