Merge "Fix Gatekeeper unit test"