Add Bluetooth fix + General Update

Change-Id: I84ddc0c7d51885e3c51d6ed982af6de509ffb60b