Merge "Update NOTICE files (the second time today)."