This reverts commit 26346525. Reason for revert: Test is still failing in presubmit Change-Id: Ic2052cd02099256b96dd221d6bde660c1d78224e