Merge "Fix google-explicit-constructor warnings." am: e218406 am: e44c337 am: 9976622
am: 639746c

* commit '639746c103e0f1261d4c461d14c1457ab75fe401':
  Fix google-explicit-constructor warnings.

Change-Id: I53d83ce57fc90a542c61f2888aff7160f420a69e