Merge "Fix/suppress google-explicit-constructor warnings"
am: dab0fc8229

Change-Id: I7203d0257d3430fb4ea6905f273328c15647d7b9