Merge "Fix security hole in GateKeeperResponse." into mnc-dev am: 039b357a -s ours am: 5048fc8e am: 5d34739d am: 733c7607 Change-Id: Id1c4c4de5d6e4da05188326287ae86e74bf89623