Merge "Only allow alphanumerical characters, '-' and '_' in event trigger names" am: 536e8ded6b
am: 0ed7feab32

Change-Id: I3c99ce901185dc246daa7af814316609b27e1df3