This reverts commit ec0e5a3e. Reason for revert: b/280553936 Change-Id: Iad9079f026f46da35f36723937db9bf5771580d1