Merge "Avoid NPE in AM.getMyMemoryState()" into pi-dev am: 29c5266d28
am: 346c55bdd8

Change-Id: Iadde2839fc6b2cb2dbc573e2252b72cc393c7732