no more entropy

Change-Id: Ie70168e4b505308556f1da7e480aaf1145a87f70
Update

Change-Id: Iced650157dcd77ecff9ce1aeaf388ea01b8d0572