Merge "Fix license_type. Contains GPL"