Merge "Adding server-side code for sending device/host details to the client."