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

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

Change-Id: I642b53133157e328f5e6425e41c40d7bdb408e75