Merge "fs_mgr: fix userdebug/user argument type mismatch"