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

Change-Id: Ia37099ed51b1b9bbf2af5dc9deab74494c5de2da