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

Merge "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: a4e58651" into oc-mr1-dev-plus-aosp
am: 9a458a16

Change-Id: I0d1141bfea4885c82dc48afaac71943de440d229