Merge "Adjust keystore2_client_tests" into main