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

Change-Id: Icf0d547c4d8447bbdfd2fe4ae191a5ac8ff182f4