This reverts commit ce0c253ae7. Reason for revert: fix build breakage Change-Id: I2a29aff8a33336e3a514ae681d7887cf3fe2d2c2
ce0c253ae7