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

* commit '8b41a4a3ca0e6d1001e5dd92b09282d8ef03c307':
  fs_mgr: remove some dead code