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

Change-Id: I23271d3d84b18411672230e6e80ef534e0066996