Revert^2 "Cherrypick upstream change to fix build."

af58a1a6d90dceb795f8975b75cf3769b0318575

Change-Id: I848a08fc5455dea04ee77ad3c62ec1d3d5d072f9
8 files changed