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

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

Change-Id: I2246aca0c0b1b12b537479ee47c293bb3079081c