Merge "Change testapps to account for API change" into oc-mr1-dev