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

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

Change-Id: I89df0ded440b86f3a6953986e6a83545ffebee69