Merge "Companion device mgr doesn't always exist" into oc-dev