Merge "Bump test key sizes to 1024"
am: d775d086ba

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