Merge "GATT: put include declarations before characteristics in service" into pi-dev