Merge "Fix/suppress google-explicit-constructor warnings"