Initial changes to restore clings.

Change-Id: Ie23e6e9f39679e8d35955a4a7db804d03f8b4d3f
61 files changed