Merge current files from rdcastro/google-cloud-utils