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

Change-Id: I8c172ed1b7b31ae9d5e485423c4efa2fc19dae88