Merge "Fix memory leak in OTA verifier code"