am e7444884: Merge "Make several key crypto parameters repeatable."

* commit 'e7444884c759b066c65e0be32a7e753c0c667709':
  Make several key crypto parameters repeatable.