Merge "Fix memory leak when GateKeeperProxy.verify() returns"