This reverts commit ace5fd11. Reason for revert: b/273583135 Change-Id: I5ab8e86a49283a97cf3c02a0786d745a905ec48f