Merge "Fix google-explicit-constructor warnings." am: a6b6252d8b am: 1676161c1d am: 316fa0aee7
am: 650615fb17

Change-Id: I0a37e6bd2c8e971c964dc5a4c4a6e6c228bce705