This reverts commit 3f5e3ad419. Reason for revert: b/297562709 Change-Id: I889d126e622e9cf13513365145eac28eaefa8627
3f5e3ad419