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

Change-Id: Ib55158e1608d7eeba7d41854377ed1e93e283a75