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

Change-Id: If93298123cfe85b1230240c36ed52ade149bd868