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

* commit '83f2f4795060352886943fff714ff14030bfdc9a':
  String literals for CL ag/586597