Merge "Include Bluetooth in baseline route calculations" into oc-mr1-dev