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

* commit 'eb859db14fbb0b7050d518edade44409ef213743':
  More memory updates