Merge "Change bluetooth routing to be more responsive" am: d79e129b5d am: 1cbd049208
am: 2c8063f6b7

Change-Id: I1567be669329de010003ee9b2c155a587846478e