Merge "Fix license_type. Contains BY-SA"