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

Change-Id: I392a46277bf1560bf5cc2b1ec6e3215408b545f5