Merge "Revert "fs_mgr: Support filesystem labels in fstab""