Merge "Fix bug where memory trim was not being delivered with correct level."