Merge "Fix google-explicit-constructor warnings."
am: a6b6252d8b

Change-Id: I1d90581b920f0d932795b029b433664f12b0698d