Merge "Adjustment to mode_skip_start."