Merge "Address API Review comments" into oc-dev