This reverts commit 679b570b. Reason for revert: b/271282260 Change-Id: I1b37c7bd7ef9dc6b6cea6222af08bce91374f60e