This reverts commit e35bc815. Reason for revert: <Build Cop Triage b/147918881> Change-Id: I6c675a3a245b10d3a0e7f3ebd7d59cf11cff007a