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

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