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

Change-Id: Id250bcbcf92bdb95813dc4fcdd772aeef7f29c0a