am a7fe759d: Merge "More memory updates" into mnc-dev

* commit 'a7fe759de7c021b0d3467c75422acb14c62f90bd':
  More memory updates