Merge "fs_stat: ignore quota fix caused by tree optimization" into oc-dev