Merge "Merge "[automerger] Fix security hole in GateKeeperResponse. am:...

Merge "Merge "[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f am: b1141b6f am: 1cd9e809 am: 6dfc8d8d am: a3c1de7e am: 4acf4fab am: 40317127 am: 159cd143 am: 24587d57 am: 0fa9328b am: 51ca9674" into oc-dr1-dev-plus-aosp am: 5ee440bb" into oc-mr1-dev-plus-aosp
am: 41755719

Change-Id: Id68f2e8108f281a971d4adf8dfa17762f862df9d