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

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