Merge "Fix google-explicit-constructor warnings." am: 7bdd6a8b5a am: 427d8d840f
am: fb44ca5178

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

Change-Id: Id823008b65856956b503b14193a98e2864fb5c98