Merge "Use lib version of data_utils in dynamic creds"