[automerger skipped] Merge changes from topic "meminfo-apis" am: e16c2ce649 am: fd7b2b2e35
am: 4bdced8d2a -s ours
am skip reason: change_id I992057f06b54569025fa0cdade9618da2675d1de with SHA1 7a6b5e8208 is in history

Change-Id: I358edb60235e5fa988426da5c59648fef900728c