Merge "String literals for CL ag/586597" into lmp-mr1-dev