Merge "Remove dead KeepaliveInfo if it cannot be started"
am: 8e1e64f928

Change-Id: I7ec41627065d21d025370905257483738ee04c42
tree: fe1900627da6fdc85842077654061078749077a5
  1. core/
  2. services/
  3. tests/