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

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