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