Merge "Merge "Fix/suppress statsd google-explicit-constructor warnings" am: 69969240 am: 32dc82a6 am: b51d2df5"