Merge changes from topic "ion memory accounting" am: 5ded8c130c am: 3c4624dcc2

Change-Id: I6620e200357ddcc46557f149e17fcad25e7c57c4