Merge "Someone is still using these APIs." into oc-mr1-dev