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