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

Change-Id: I93d6d92ef1fab873c9144d70b271b61c26694930