Merge "Not defer network disconnect event in Probing state" am: 8292fe9d83
am: 2f8c8439a5

Change-Id: I4c607b4abd71ecdc906845fefebcc1dc33755684