Merge "Revert "Prepare for @RequiresApi class retention"" into main