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

* commit 'c88e1396db12e430dde63afc3d44c1f37a7fce79':
  Make several key crypto parameters repeatable