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

* commit 'b90a2f9d1a58586ef8215176bae22ac6dc4eaee3':
  String literals for CL ag/586597