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

Change-Id: I4e7a79de157e5204abd8e9e5493e835b0ab34470