Merge "Add GateKeeper to core build"