Merge remote-tracking branch 'origin/upstream-master'

BUG: 62449817