This reverts commit 495665dc. Reason for revert: b/73018322 Bug: 73018322 Change-Id: I1b83c4d916159e6961ec30576c7629e57978a72d