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