Merge "Fix CTS test according to API change." into oc-dev