Merge "fs_mgr: Fix ZRAM error when ZRAM disk size beyond (2^31-1) bytes"