Merge "Updates based on API council guidance." into oc-dev