Merge remote-tracking branch 'origin/upstream'
Import: b/316037781