Merge "Change pResolveString entrypoint to kSaveEverything."