06df8fe4d8
This reverts commit ef7b4d5dae.
Reason for revert: Possibly broke a test
Bug: 187112839
Change-Id: I16ac2a155af9a0ae2ea60f55c52e0b3bf4307089