Updated to support golang changes

(cherry picked from commit 8583518bfd2c0b621bbef366315e1aa074f29f5a)