Merge "Change protection level of companion permissions" into oc-dev