am aa25204f: am 93557002: am 37fd839f: Merge "Revert "fs_mgr: correct warning on unused function parameter""

* commit 'aa25204f43421fe363238176d74e68eb8cdb5b01':
  Revert "fs_mgr: correct warning on unused function parameter"