Merge "Companion device mgr doesn't always exist" into oc-dev
am: 3d6225b4e2

Change-Id: I10420e5cf8fdb6359c8191d0626cd71ecab395aa