Merge remote-tracking branch 'origin/upstream'
Import b/312436741