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

Change-Id: Ia7329a5ad05ec24c61df4fdb29e49ceeb2e5b244