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

* commit 'a0c6605b67863410b82b6dde322423dc23680967':