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

Change-Id: I90fdcbd61803465692e77e99954bf3bd2aa3d248