Merge "Update the NOTICE files"