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

Change-Id: I635f64bba684bb7f20303f1dbd80f2ee2a1cb815