Merge "Fix incorrect sv id offset for bugreport"