Merge "First draft of StatsEvent.java" am: 4e2e5a96b8 am: 2a6214ca33

Change-Id: I073a67675ec82623cdcfda7cbfaf0fb9ca3ee80d