Work on getting fedora to prepare properly

Change-Id: Idb0e87f5e4760c23542f4887d829b6950a95db57
Merge "Work on getting fedora to prepare properly"