Merge "Fix google-explicit-constructor warnings."
am: 0cf9f2b714

* commit '0cf9f2b71449ef849a2cd95dad26c7c919a81cb1':
  Fix google-explicit-constructor warnings.

Change-Id: Ia53fba533204aaf0667b3db3bc64fccb18ed0e80