Merge "Fix NPE crash in AppInfoBase" am: e49cc3d659
am: abcb069d95

Change-Id: Id60245ba109dc977ee1078e8d3f50288e5bdbcc7