Merge "msmzirc : Fix the system partition index value"