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

* commit '0944e305ff0a04fd1be8c1d5d157e68d11936802':
  fs_mgr: Support filesystem labels in fstab