Merge "Bluetooth: fix comment wording" am: 6ba7c54a51
am: eeedda1453

Change-Id: Ib0cdcf77d471c814651a157fc79c818f99923250