This reverts commit 76badfcf14.
Reason for revert: Superceded by ag/10519773
Test: presubmit
Bug: 146513245
Change-Id: If7320c44cd774093ddd62a45e0fd01c528dc6499
This reverts commit 76badfcf14.
Reason for revert: Superceded by ag/10519773
Test: presubmit
Bug: 146513245
Change-Id: If7320c44cd774093ddd62a45e0fd01c528dc6499