Merge "Add a feature flag for CTS." into oc-dev am: 9ff3ec4872
am: 4a4b6b6211

Change-Id: I8c59cbd4140ae6c449f715588cbba6540577eb0d