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

Change-Id: Idf7b8caca19d0062955e3423c1420c7247a900bf