Merge "Modify Bluetooth Class of Device from Android stack"