Merge "Fix AES corrupt padding test"