Merge "Check for uses-feature in Companion APIs" into oc-dev
am: 7575fa7600

Change-Id: I99ca8f54d480a8a297a8e82d7c0883a628541b89