Merge "Fix mmap size 0 errors" into oc-dev am: d72bb124d3
am: ea098bf560

Change-Id: Iacdad15953cf6e391b6148666ca1a240095066fd