
Automatic merge from submit-queue Fix some lint errors. `golint` for some reason doesn't like `make([]foo, 0)` so switch to explicit instantiation.
Automatic merge from submit-queue Fix some lint errors. `golint` for some reason doesn't like `make([]foo, 0)` so switch to explicit instantiation.