am f6070528: am eca8ea82: am e220e9e0: am 7169b230: Merge "fs_mgr: correct warning on unused function parameter"

* commit 'f6070528844d41d70b22461df85e5a714e5f9924':
  fs_mgr: correct warning on unused function parameter