Merge "Fix companion uses-permission enforcement" into oc-dev