Merge "Allow companion device mgrs channel access" into oc-dev