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

Change-Id: I1b2e8026cf2db083fb17ab03d0e1972addffdbbb