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

Change-Id: I47d2c14c8afa73a94fca2b40e5a08f31d642b31b