Merge "Use UINT16 for GATT attribute id field"