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

* commit '585cc73a1b76df71d0002b25ca646be217305f61':
  Revert "Bump test key sizes to 1024"