Merge "Add Apache license header per file"