Merge "Modify Bluetooth Class of Device from Android stack" am: f4ec2ab7 am: c037004f am: 69da7a17 am: 252eebec Change-Id: I24594136dcf5e813f0e29de896fbb5d3abd7b777