Merge "Make getKeyStoreForUid convert uid to namespace."