Merge "Optimizing: Improve const-string code generation." am: 085055f am: 0b92b73
am: a1357a8

* commit 'a1357a82251881f69060bc33bb7c9256f70cda7b':
  Optimizing: Improve const-string code generation.

Change-Id: Ib0de96c301ab2e900430b50415fe435bd4c78abc