This reverts commit 1cbfc3b0. Reason for revert: CL was no-op Bug: 189281134 Change-Id: I2c70b51dd1d2f679a8310b1847675360ce415d35