am 03e30ba2: am c1aff829: Merge "Add missing NOTICE files"

* commit '03e30ba28f3c68bb72966f6f10795db042caa305':
  Add missing NOTICE files