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

Change-Id: I5a8a2934a83691c4689dfd3a7de9c1ea6da66032