Merge "Remove dead KeepaliveInfo if it cannot be started"
am: 6360a83b6c

Change-Id: I7ec41627065d21d025370905257483738ee04c42