Merge "Don't send more than 2K to addRngEntropy" into oc-dev am: 7eeb6b5079 am: 35e1be70b4
am: cb6c717104

Change-Id: I560fa783255e83454fb0e32861ca26f7f79b8a3d