Changes in Entropy and Crypto

Change-Id: I10922297b0390506d118d7a7eaa13d4ae0d0f258