This reverts commit ba068f4872. Test: builds Change-Id: I2c4d64e26c2e4ceb710a39de2ee9749160d33a72
ba068f4872