Fix golang-protobuf tests am: 34d48059c2 am: b34db27e38 am: 5c0a661709

Change-Id: Ibebf4773651beb6829f6c55f2b7b0817cf2045d7