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

Change-Id: I43d1cc625834092f12adec5ff52d1565d1b91e23