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