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

Change-Id: I1e289081553afc516c96584822e36c3475675e98