am 80364b94: am 6ca11db7: Merge "fs_mgr: Fix ENOMEM behavior when dealing with slotselect."

* commit '80364b94bc2f017f0d8e47c0fdb0d208fd33ff09':
  fs_mgr: Fix ENOMEM behavior when dealing with slotselect.