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

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

Change-Id: I10c47f1c6502c038fdc82271bc829635a22cbead