MB-11779: memory accounting crap

Change-Id: I8f4d4a8ccc3471f2596c7d2c51b280c687d47638