Merge "Autodetect NetworkStack path in rollback test"