Merge "update docs per API council" into oc-dev