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

Change-Id: Ia694c1a5824eaecd984f9710926ea9cad4809354