am 7fe50c62: Merge "Change heap base address"

* commit '7fe50c6239e298a9ff7918dbc73d9eeb6666a7dc':
  Change heap base address