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

Change-Id: Icff6bbdbca4ace653570d9288ec6095b22cb37c5