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

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