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

Change-Id: I91a00a8afe10708ad5345a0ed6e41ce501a0d1d9