[PATCH 15/16] Use util_get_random()