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

Change-Id: I46a95ea5eb9199c63e8f0a62ddf7c6eac149147d