Merge "Optimizing: Improve const-string code generation."