Merge "ahat: ignore duplicate instances with the same id" am: cd15294af8
am: c3143f65f7

Change-Id: I4d86eabb005ff487b685fcfa29246b8fd120e503