Merge "fsmgr: fix integer overflow in fs_mgr"