Merge "Use Apache license for newly added files"