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

Change-Id: Ic3c8b7d97d43d677f921201fd65be849cc7fb5b5