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

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

Change-Id: I73adb12e72e02387e9a1182da2c65a6cc1381c39