Merge "Pass sessionId instead of whole object during pre-reboot verification"