[automerger skipped] Replace Entropy with RAND_bytes am: e489a0371e -s ours
am: 0c42526a44 -s ours
am skip reason: change_id I579d140ef56c90b477b0d8989e3b02375681aee8 with SHA1 44d1afa2c0 is in history

Change-Id: I0d5f24e3a862ddfbf186f6157008d04cac8a4e1c