Merge "Update license references"