Merge "Fix google-explicit-constructor warnings." am: bf1767f
am: 96dbbbb

* commit '96dbbbb7b4e3c2be2d016eaf15a159622312a56d':
  Fix google-explicit-constructor warnings.

Change-Id: I948158330b745cedd679eab32b2bc15266ef3c59