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