Merge remote-tracking branch 'origin/upstream'

Import b/319324143