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

Change-Id: I2b2ebbb7c4bb4a66467de305e6e60b4df46c8dbc