Merge "Handle 'sk' being NULL in UID-based routing."