Merge "Fix google-explicit-constructor warnings."