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

* commit 'bf18889a3072acd7719784051ddb22b0cd875219':
  Initial changes for new clings. (Bug 11142616)