Merge "fix NPE in updateClientUids"