Merge "Changes made in keystore2_client_tests to avoid test timeout issues."