Merge "Fix CTS tests according to API change: Array -> List" into oc-dev