Merge "Fix license type s/b BY_EXCEPTION_ONLY"