Fix some issues with wipe partition list

Change-Id: Ie7d5878faf86b8fa824b72211be7fd3596b471d7