Merge "fs_mgr: adding fs_mgr_get_slot_suffix() public API" am: b26f48f135
am: 4c96971cee

Change-Id: Icad63b84bb6de85b1a73db84a784ad8b5bdb0f38