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

Change-Id: Ib257dd212b57464ac1aeb372798805798ea161cd