am 6cfd4351: am dfb05e7a: cleanspek for Bluetooth API change.

Merge commit '6cfd4351bb5fb8e1b36fc0ceb3ad3ed36f949324'

* commit '6cfd4351bb5fb8e1b36fc0ceb3ad3ed36f949324':
  cleanspek for Bluetooth API change.