Merge "Merge "Fix/suppress statsd google-explicit-constructor warnings" am: 699692402a am: 32dc82a63a am: b51d2df568"