am 85ef3b5b: Merge "Update NOTICE files."

* commit '85ef3b5b80da353afa24d0ab21c35be01951e0b7':
  Update NOTICE files.