Merge "Add verifyHotspotClientUpdate helper function"