Merge "Bluetooth: Application changes for A4WP"