Merge remote-tracking branch 'goog/master' into pi-dev

Bug: 111553225