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 'a04a89d3f5bf5c74be2c45edf4a8e2fa26f7b071':
This commit is contained in: