Merge "Fix license header violations"