Bluetooth patches

Change-Id: I74646c92eeffdb14becda50b3445ccd0737903d0