Reconcile bluetooth and telephony f_b guts with CM

Change-Id: Icedb9fec1d77845848bebf5b9a0afd21ca5b9d01