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

* commit '5ab0c9c9e37d8ca17b2e40ccaf6913149cdd78c2':
  More memory updates