Merge "Fix license_type. Licensed under CPL"