Merge "Fix/suppress core/jni google-explicit-constructor warnings" am: ddeab2c144
am: e053f576b1

Change-Id: I4f616e311f55fff41b79236730d0b69d96d54cbf