Merged to master with no CHANGES note; cherry-picked to rt45637 so it'll be
part of the performance backport.