Merge "Fix/suppress google-explicit-constructor warnings" am: c4f5492a93
am: 182fb759fd

Change-Id: Ia0348c26290bf54a10a35981e65afcd516a22689