am 99f4ac14: am 97fce66f: Merge "Make several key crypto parameters repeatable"

* commit '99f4ac144506d307b38ab112d1054e5fe18a7217':
  Make several key crypto parameters repeatable