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

* commit '1fdd4dc0bc44af0dbbd458b44a84db9e775ebe7d':
  Revert "fs_mgr: Support filesystem labels in fstab"