Merge "[AWARE] Modify the discovery session handle to uint8_t" am: ff14eb32cd am: b4df78f006
am: 2ec9fbf47b

Change-Id: I5411cf3059ea7a387fe0bb4a4959865b5c6bf5bf