Merge changes from topic 'rs-rebase-275480'

* changes:
  Re-apply local patch dropped during 'git merge'
  Incremental squash-merge of aosp/dev to aosp/master
  Update aosp/master Clang for rebase to r275480