Bluetooth fix

Change-Id: I18d09c866c519f60aad6ab458b18a1880abcb8dd