Merge "Detect NetworkStack path in rollback test"