Merge "Fix test after register allocator changes."