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

Change-Id: I2cb67a86db08ab997d42c5a7cbe7b203e88e7bb2