5064be12db
This reverts commit bde366ddd1.
Reason for revert: b/232441427
Change-Id: I1047435fe39900203b69fdfc87d256b1330a325a