3e8a04b341
This reverts commit b45d6c421d.
Reason for revert: b/231283023
Change-Id: Ic4941ea9ecd382348aae8e099e5a7ebf4ed0bba3