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

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

Change-Id: I4da792e8a2036ba0970c7eceed599ad27ba03535