Merge "More memory updates" into mnc-dev