This reverts commit 99c4becf24. Reason for revert: b/287488354 Change-Id: Ic4db08ca771f1d744ba2c19eb55b9f2d277ad529
99c4becf24