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

Change-Id: I104eea9bf02f89b6c2bde0daeff81aaa781e323d