Merge "Handle nullptr from mapMemory properly" into oc-dr1-dev am: b9bacc624e
am: f64d4f6e48

Change-Id: I42122416afc64235cc449070e371ceb7776b43c0