DO NOT MERGE: BUMP CTS 6.0 to R3

Change-Id: I25758ecc0d3e9843b8b1b2f184c344a5766fb569
2 files changed