Merge "Adjust testapps for API changes" into oc-mr1-dev