Merge "Hide deprecated APIs." into oc-dev