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

Change-Id: Id1c4c4de5d6e4da05188326287ae86e74bf89623