This reverts commit e40e3268. Reason for revert: b/280863001 Change-Id: I1920bb2c679899eff6f3ed10983380671c660997