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

Change-Id: I96c804fe006cfefb0b635f88a0f8d0e185576c3b