Merge "Revert "fstab: /persist does not need trimming""