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

Change-Id: I545524b640fc1fbef547b0006fa6288bc45be7c1