This reverts commit ee53a98e. Reason for revert: build break Change-Id: I065b702d6eaa2e72d47a2b7a404fdd7fe51661c3