Merge "Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:...

Merge "Merge "Fix security hole in GateKeeperResponse." into mnc-dev am: 039b357a  -s ours am: 5048fc8e am: 5d34739d am: 733c7607 am: 6adae510 am: a175bae6 am: 510f0224 am: 69ae08b6 am: 35c3b58d am: c29ad5c9" into oc-dr1-dev am: 51654d92
am: 4e6e2792

Change-Id: Ibc1e37477a8b3685ab9b3d3c94e4ea3225cc843c