Merge "Fix/suppress statsd google-explicit-constructor warnings"