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

* commit '5d6b0b41808e69c644cbc85d90a5842d5563e3dc':
  Make several key crypto parameters repeatable.