Merge "Bump test key sizes to 1024"