Merge "Use handles to identify GATT attributes (2/4)"