Merge changes Icaa2d90b,Ief489088

* changes:
  Add KeyValuePairs support to StatsEvent.
  Add StatsEvent.Builder