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

Change-Id: I9f2d7219646f2b54dd25a3b8fb78262abf7420e7