Merge "Fix google-explicit-constructor warnings." am: 7ec2e36
am: 1ce5f21

* commit '1ce5f21453f7132537bb684933cfc37cccef8c42':
  Fix google-explicit-constructor warnings.

Change-Id: I49921e86b37c68a53825b91a0515a93eaf416193