Merge "Fix memory leak when GateKeeperProxy.verify() returns" am: 855a643d3a
am: 1729875503

Change-Id: I0e71c2154569613653890fb525743c5f506b0721