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

Change-Id: I25af44d8d8c64036ad39346faa363e2154cfbbc5