Merge "Fix NPE crash in AppInfoBase"
am: e49cc3d659

Change-Id: I719b50356e890e57a8d6574aae23a2d5d0fd989b