Merge "Fix mmap size 0 errors" into oc-dev