Merge "Fix google-explicit-constructor warnings." am: f68c7ea3c4
am: 7c0e9cc0a7

* commit '7c0e9cc0a76402a932a1093289f9c13e58ae0ee3':
  Fix google-explicit-constructor warnings.

Change-Id: Ie5a2092abae1edb68d344c21863b8f8bd1ee9191