Merge changes I15abdf13,I70304168,I52b0cb8e

* changes:
  General cleanup; add support for key-value pairs
  Move type ids to stats_event.h
  Set default timestamp to elapsedRealtimeNanos