Merge "Add license type: Apache2+BSD are NOTICE licenses"