am c821adde: am a6a04357: fs_mgr is now different on different build types

* commit 'c821adde0e65e5c678d27afa6245090d791c6d5a':
  fs_mgr is now different on different build types