This reverts commit 66cc81b7. Change-Id: I1abbd42f1e48202760031ed3da49da085401d975 BUG: 63702919 BUG: 63847006