This reverts commit 33b6654e. Reason for revert: verify build breakage Change-Id: I712a9de8ca3bfb17c36d3b8efa6176cdaf26640e