Merge "Add new fields - |upstream_events| and |duration_millis| in stats.proto"