Merge "Fix fstab memory leak"