Merge "New APIs for a keystore client to list and get keys"