Merge changes from topic "meminfo-apis" am: e16c2ce649
am: fd7b2b2e35

Change-Id: I89421f1fab7b6c9da570cc2195543e64ea4d4137