am af191cd1: am 6b66025f: Merge "fs_mgr: fix build breakage"

* commit 'af191cd157f076ee5d99890711e2881a60d7770a':
  fs_mgr: fix build breakage