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

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