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

Change-Id: I626faecd254e3e543308143cfe69d1393e1f9267