Merge "Fix security hole in GateKeeperResponse." into mnc-dev am: 039b357a46  -s ours am: 5048fc8e92
am: 5d34739d70

Change-Id: I51f9bbaa35a853ec3442267cbb9327a2a64ff1d1