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

Change-Id: I61f441237fcaadc5abc5592e7a63e4d35282def5
tree: 9d4e1d81952d11383430dda4584f20f2bf1eac82
  1. core/
  2. services/
  3. tests/