Merge "Fix explicit constructor warning from cpplint"