Merge "Fix/suppress pipeline google-explicit-constructor warnings" am: 63790135f4
am: 2cd94bae8d

Change-Id: I4163be5e021a4d14ba51985984b924e74ac324c2