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

* commit '748c046999e0ead012816e2bc63d96e3b9a47162':