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

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

Change-Id: I7ff1a09d757b71252db243b6527f6c131d11c4a6