Merge changes from topic "meminfo-cleanups"
am: 3d8b4f5f44

Change-Id: I9397da908b9cd511f5ebf38c276cbdd95e0fdb6f