am 9680eaa1: Merge "fs_mgr: remove some dead code"

* commit '9680eaa182460035265cdac7d92f09feaff4d710':
  fs_mgr: remove some dead code