handle duplicate events properly am: e9f0063cc2
am: ed6000fd5f

Change-Id: I433ed0581ce4e30c04dea8b56b12b57607ad3fbd