Merge "Fix google-explicit-constructor warnings." am: 52197e3286 am: f04e5ddd4e
am: 990e56bbae

Change-Id: Ic850e779a04129fea4b371e54378c19ef0163fb2