This reverts commit a9f22240. Reason for revert: broke build Change-Id: I08d1e3b6f7f02627138ff3f50b436772e1eb756f Fixes: 144460136