Merge "Fix google-explicit-constructor warnings." am: 0e1a7167e4 am: c643a4c927
am: 805a75180a

* commit '805a75180a629b35678e894306609556a0a896e6':
  Fix google-explicit-constructor warnings.

Change-Id: I3d5c034f83ed0e07a74ac149fc1a475fcad28ecc