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

* commit '3e64bf45e65641c0dd946de6eefa552718f14c1c':
  fs_mgr: fix build breakage