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

Change-Id: I4d540fadf69842a45fc86f08f8fc3f10cab5a0c7