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

Change-Id: I6221bdff630ebef88bfd9d609e31a0f9ede036ad