am 25919277: am 8a30bf23: Merge "Add some more DISALLOW_COPY_AND_ASSIGN"

* commit '2591927761cbec8665a38d23980e36037d08ee07':
  Add some more DISALLOW_COPY_AND_ASSIGN