Merge \"Use UINT16 for GATT attribute id field\"
am: 8babab0d5c

Change-Id: Ie05e1a7c4045aba6ef071424a7bd6a95e80cc71f