am dd7e09cf: am 17e40430: am fab294ca: Merge "Fix bug introduced in last change.  GATT define was after BLE_INCLUDED define." into klp-modular-dev

* commit 'dd7e09cf861b0da60a09dfabb665d4001d540bdf':
  Fix bug introduced in last change.  GATT define was after BLE_INCLUDED define.