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

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