Index: firmware/App/Services/Messaging.h
===================================================================
diff -u -r9fcd1ad071bcce7a592833367c103e235e49654f -rf99f8b365af2274d68d7f424cc9be9815b4db19c
--- firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision 9fcd1ad071bcce7a592833367c103e235e49654f)
+++ firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision f99f8b365af2274d68d7f424cc9be9815b4db19c)
@@ -50,6 +50,14 @@
 {
     U08 userRequest;            ///< request to confirm, cancel, or reject off button request
 } UI_OFF_BUTTON_RESPONSE_PAYLOAD_T;
+
+/// Payload record structure for off button response.
+typedef struct
+{
+    U32 id;
+    U32 command;
+    U32 reason;
+} UI_OFF_BUTTON_PAYLOAD_T;
 #pragma pack(pop)
 
 /// Payload record structure for UI response.
@@ -161,12 +169,12 @@
 BOOL handleUICheckIn( MESSAGE_T *message );
 BOOL handleTesterLogInRequest( MESSAGE_T *message );
 BOOL handleUpdateAvailable( MESSAGE_T *message );
+BOOL handleUIVersionResponse( MESSAGE_T *message );
 
 BOOL testTDSoftwareResetRequest( MESSAGE_T *message );
 
 // Test send message helper functions
 BOOL sendEvent( TD_EVENT_ID_T event, EVENT_DATA_T dat1, EVENT_DATA_T dat2 );
-BOOL sendOffButtonMsgToUI( GENERIC_CONFIRM_COMMAND_T cmd );
 BOOL sendPOSTTestResult( TD_POST_STATE_T test, BOOL passed );
 BOOL sendPOSTFinalResult( BOOL passed );
 BOOL sendUIVersionRequest( void );