Merge "Remove dead KeepaliveInfo if it cannot be started" am: db4ce87059
am: 346e7b658b

Change-Id: I61f441237fcaadc5abc5592e7a63e4d35282def5