Merge "Bridge system: Fix memory leaks and double frees on impart failure."