Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev