This reverts commit e579033d76.
Reason for revert: b/120160981, broke CTS
Bug: 120160981
Change-Id: I2caa58b155e24281ae02f96dc9c54458df15fc5a
This reverts commit e579033d76.
Reason for revert: b/120160981, broke CTS
Bug: 120160981
Change-Id: I2caa58b155e24281ae02f96dc9c54458df15fc5a