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