Merge "Fix method index for GDB information"