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 am: 35c3b58d46
am: c29ad5c94c

Change-Id: Ie4453acd727f8f581c1224ee0f288e3150b97446