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

Change-Id: I10ff41b46fc46726298ba84e4f88e8c1e7cd58da