Merge "Add license type: MIT+BSD are NOTICE licenses" am: e484b5413b

Change-Id: I4a11ec631412faadd569d175cb28e9e2cea42924