a997ca437a
This reverts commit 157d3b950d.
Reason for revert: b/197129604
Bug: 197129604
Change-Id: Idf2267528fade23291aedea9787d98601495537c