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

Change-Id: Ia916a0c1a5ec5d63e4e76ed9da9d563fd39d3823