Merge "Specify rotation target for CTS shims" into tm-dev