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

* commit '55a05e4d35c0886733586db0d5aa1af5030d35a7':
  String literals for CL ag/586597