Merge "Revert "Bump test key sizes to 1024""
am: 9ea70e7af8

* commit '9ea70e7af833befaf45fa6665754df416375294b':
  Revert "Bump test key sizes to 1024"