Merge "Revert "Use fstab v1 as a default."" into cm-10.2
Update wipe data option confirmation