am d5ebb871: am bf18889a: am d1e474a9: Merge "Initial changes for new clings. (Bug 11142616)" into jb-ub-now-indigo-rose

* commit 'd5ebb871f9187699ecb0cebd963d6dd53557b333':