Merge "Move Bluetooth off the product="..." strings xml feature"