Merge "Use references in GATT client/server API (3/3)"