Merge \\"Fix the generated getevent labels.\\" am: 80beb506cf
am: 2f589bf974

Change-Id: Ia525ee4a6bca5ad2f83ebaddc4d73968474100fd