Merge "Bring dummy cling strings back as 'strings'" into jb-mr1-dev