Merge "Check for uses-feature in Companion APIs" into oc-dev