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

* commit '90e9203ff95433397a0e94dad26747c45efabc3c':
  Bump test key sizes to 1024