Merge "Revert https://r.android.com/3477936" into main