am e6401ece: am 5b449dc3: Merge "Bring dummy cling strings back as \'strings\'" into jb-mr1-dev

* commit 'e6401ece8a3502b9ad4329a572b596175676f1d0':
  Bring dummy cling strings back as 'strings'