This reverts commit d528756a. Reason for revert: b/286093328 Change-Id: I10122c420ad84a40aac12742bbc4f911f1d87b0b