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

Change-Id: I25c5959c7a295eb1c46d688aa8f52f2f2195c1ad