am f9e23395: Merge "fs_mgr: Support filesystem labels in fstab"

* commit 'f9e2339553f70aebdd170e96ab9332b28c3851b4':
  fs_mgr: Support filesystem labels in fstab