Merge "Don\'t use fixed addresses in mem map test" am: d7c76bd7e8
am: cdbd3e188d

* commit 'cdbd3e188d98ba9c909598201c8f6f4fa88f44e1':
  Don't use fixed addresses in mem map test