am: 2408bd47 * commit '2408bd47': Optimizing: Clean up after const-string sharpening. Change-Id: I98dc57984f56ff2108277821570d8118366ea193