Merge "Don't send more than 2K to addRngEntropy" into oc-dev