am 122349a7: Merge "Fix StringChange for optimizing compiler." into mnc-dev

* commit '122349a7672da6636ca94aded7f2d3642f9962e3':
  Fix StringChange for optimizing compiler.