am 0b3a8a74: am 8b41a4a3: am 9680eaa1: Merge "fs_mgr: remove some dead code"

* commit '0b3a8a749333a4d8923bf40a99a479e335e0c94b':
  fs_mgr: remove some dead code