Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev am: c55f7d2180
am: 8e079af6ad

Change-Id: I739f5aa80a75f34230593173f2536fe8d0e33bca