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

Change-Id: Ia4634d47562e052205605fd23d98b4ec844de139