Merge "Bump test key sizes to 1024" am: cf94a62b4d
am: ab84f6a805

* commit 'ab84f6a8057872bb1948037bcd258234199f9710':
  Bump test key sizes to 1024