am dbd9a4b6: Merge "Allow entropy to be provided to some operations"

* commit 'dbd9a4b651aed25a50976ca0a68a979cc3f299fa':
  Allow entropy to be provided to some operations