Merge "Follow-up I5bcae848: Remove from 1.33 RL, backported to 1.32"