Merge \"Prevent crash from null ApplicationInfo after package is removed.\" into nyc-dev
am: 42edc7c2c2

Change-Id: I6400e818f7333323e633756bf63e582e5b658900