Merge "Fix google-explicit-constructor warnings."
am: f966019

* commit 'f9660191f03a7e2ee83064c5240e97a82a482769':
  Fix google-explicit-constructor warnings.

Change-Id: I9fb5f687858dba101fd6f3f5e728cce2d4d815e9