Merge "Fix security hole in GateKeeperResponse." into mnc-dev am: 039b357a46  -s ours am: 5048fc8e92 am: 5d34739d70 am: 733c7607d1 am: 6adae5108c am: a175bae662 am: 510f02244d
am: 69ae08b680

Change-Id: Ida122a46fece975924a002e6a5a0f6521ed8756f