Merge "Add event monitoring to Inferno." am: 945911cbae am: 878c04ed7d
am: d9a9139b54

Change-Id: I7667a49e426cd64070a5d9685453025888671fcc