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

* commit '5b449dc3095192fecd4760d9f550de65e588e3dc':
  Bring dummy cling strings back as 'strings'