Merge "[AWARE] Remove reason from discovery session terminate callback" am: bbbe5e6ccd
am: dce01e235b

Change-Id: I0e693ff19f8c08212c4daadebc3b6af33e239eda