Merge change 20007

* changes:
  Add Bluetooth app to generic product file.