Merge "Fix a memory leak in gatekeeper."