This reverts commit 03f06070. Reason for revert: Build break commit has been reverted. Change-Id: Ie80a4173e92709a2ab75c6c2174adacf58c2f776