Include Bluetooth in baseline route calculations am: 95f2db9984 am: b5bfdc1917 am: 93bf4f7145 am: be66c70061  -s ours
am: b58bf94e74

Change-Id: Ie94a9bd6b80c7e61454ad72859c1d44fb8abe0f9