Merge "Add license type: Apache2+BSD are NOTICE licenses" am: 5808fcfbfa am: 04d34a1a67 am: d603c28f41 am: 7118b6bc62

Change-Id: I42ce3deed7911d818cb849e3954f4bb96e45b95b