Merge "Removed deprecated APIs." into oc-dev