This reverts commit aa204ec4. Reason for revert: b/300158981 Change-Id: I4e969c7fccade0f8e1b29cb6267c27355ddca866