Merge "Update Copyright and Licensing markings"