Merge "Fix google-explicit-constructor warnings." am: 0cf9f2b714
am: ee091a8068

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

Change-Id: I082952bf2e6d2884d45535c9c08dc9fa9aed2a08