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

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