Merge "Add Data Saver utils in Firewall test helper class" into main