Merge \"Update CTS shims\" into nyc-dev
am: 6f140a249a

Change-Id: I6746c7b2484398787dc29fb9a67cba88b79ad74d