Merge "Fix AssertionError in test_rand_password_with_len_2"