Merge "Fix concurrent modification exception in KeepaliveTracker"
am: 9916a63bf6

Change-Id: Ibd23240fdf8fb56b4216e2482152f605374f76db