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

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

Change-Id: Id03175e2056cc91ba43a3cafd04c1d5449401d82