Merge "Clean up the keepalive slots when network disconnect" am: 8e63c9cc01
am: 0dd9daed86

Change-Id: Id3e4e159713c0ed7e03f45169e87b73ae6408e4f