Merge "Optimizing: Clean up after const-string sharpening." am: 3d8762c
am: 2408bd4

* commit '2408bd47b90d2e6d1536083d3f56932e71aadf76':
  Optimizing: Clean up after const-string sharpening.

Change-Id: I98dc57984f56ff2108277821570d8118366ea193