Merge "Change pResolveString entrypoint to kSaveEverything."
am: d985a5a81a

Change-Id: Ic14a13e028b171a3c04ee7ede0847b73b05a0492