SoftwareGuideCover: Re-order code to simplify non-interactive run

Change-Id: I2d436c8e0f9ba8e11d6879ed53b828d4f34788c7
Merge "SoftwareGuideCover: Re-order code to simplify non-interactive run"