Merge "Refactor String resolution."
am: 37ee471e82

Change-Id: I13cbe3fc3b8ca08307585a8c07b73700f2ffd252