am 4083ed7d: Merge "Revert "fs_mgr: Support filesystem labels in fstab""

* commit '4083ed7dff6e1dd8e20bec04f9451061951394f5':
  Revert "fs_mgr: Support filesystem labels in fstab"