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

Change-Id: Iee4461d89c1cb59df12afbbca26d51c87fadae62