Tentative fix for go flags

DO NOT REVIEW
DO NOT SUBMIT

Change-Id: Ic40051f21e7d0c8769d0d792218077900744fb0d