This reverts commit fbdde763. Reason for revert: b/258704479 Change-Id: I8f40d5bb8885f1abf06e67f65bfcec3cdfc03d24