Merge "Fix google-explicit-constructor warnings." am: ea537bf5b3 am: 9c0b881c9d am: 1ab51f3769
am: bd070b7792

Change-Id: Ibb5f0df9e4c4119330224075bb91b3961da1ab64