Merge "Fix unaligned access to auth token user_id"