am 7e070a1f: (-s ours) Merge "DO NOT MERGE - Move memory layout to driver."

* commit '7e070a1f76a8137e2009f3789682763798fb4f98':
  DO NOT MERGE - Move memory layout to driver.