Merge "Reset variable indicating activation when discovery is stopped" am: 03895ede7c

Change-Id: I586839b0b101742ce2bed95f96cbe46d36fdbf95