Merge "keystore: fix import as other UIDs"