Merge "Initial changes for new clings. (Bug 11142616)" into jb-ub-now-indigo-rose