Merge "Move the host preparer to the plan file instead of module test xml" into main