Merge "PatchPanel: Fix crash when tearing down "pass thru" software patch" am: f27d1e474b am: 8a56a515b3

Change-Id: Ice33ebe13b358de4c3427733d3af432c44b45b62