Merge "Fix/suppress google-explicit-constructor warnings" am: dab0fc8229
am: e7cc7dd9ef

Change-Id: Ia7f4bf82546c855d59349c16b17fb96a21b311f7