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

Change-Id: Ie2f656053f24e8ea55eb3ff7f8e2ce799805ea5a