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

Change-Id: I382e276fbd8c045732c7c4cdde0ff478993484e8