Merge "Fix concurrent modification exception in KeepaliveTracker"
am: 7da0d7f02e

Change-Id: Ibd23240fdf8fb56b4216e2482152f605374f76db
tree: 29a23503bf33b0de052279f48c4d875d4316feef
  1. core/
  2. services/
  3. tests/