Merge "Batch fetching of key descriptors from Keystore"