am 4e0bdd10: Merge "fs_mgr: Support filesystem labels in fstab"

* commit '4e0bdd1034ffcf55f4ebcbd547cf4aad59c05f03':
  fs_mgr: Support filesystem labels in fstab