Merge "Fix Go lint errors"