Merge "Merge "Fix google-explicit-constructor warnings." am: 0cf9f2b714 am: ee091a8068" into nyc-dev-plus-aosp
am: 2e16cf3b48

* commit '2e16cf3b48caac4913e62f454d15bcf447dfbd61':
  Fix google-explicit-constructor warnings.

Change-Id: I3af1804aa21c1e60b987bece7badacc0e40ae881