Merge "Fix security hole in GateKeeperResponse." into mnc-dev