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

Change-Id: Ia73c39281f851b5a5697b5045635f1b61a50fe39