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

Change-Id: I07b451a209d5b713420b1fd86ee3d6dee508bc41