Merge "Merge "Remove dead KeepaliveInfo if it cannot be started" am: db4ce870 am: 346e7b65 am: 2404b4d1"