am: c5e50121 * commit 'c5e50121': Optimizing: Clean up after const-string sharpening. Change-Id: Id03175e2056cc91ba43a3cafd04c1d5449401d82