net: sync from mako lollipop + fix
random: fix to have it proper after commit 175431dbddf26850dd1fba8f0339a3cfce9609a8