Include device name in FOTA MARs.

This is the same as #158, but for FOTAs. I also got rid of duplication.