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

Change-Id: I66066306217caccbaa624918f37af0335f59a108