Merge "Fix google-explicit-constructor warnings." am: caff47a0c4
am: 4a912c41d3

* commit '4a912c41d39a1e55fbfc5610ed480b4023b34fd0':
  Fix google-explicit-constructor warnings.

Change-Id: If184ceba0bd601eadf3389d98a43dbfcf67f68ab