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

Change-Id: Ic343b1f5702d0aa741e6a01ad124ff80697686fe