Merge "Add license type: MIT+zlib are NOTICE licenses"