Merge "Refactor String resolution." am: 37ee471e82
am: c10b73bdb5

Change-Id: Ib35cd1b8f5b862eb706a9a9552ffdaf7e3fd2569