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

* commit '253b9cfba53d3f45e908856d311e28de9e5c1017':
  fs_mgr: Support filesystem labels in fstab