Merge "Refactor logic in the enter() of WaitingForNextProbeState"
am: 88f385b083

Change-Id: I992cf162c166e5fd18e8446a44148d359c6cd63e