Merge "Add check for hypervisor state before getting uptime"