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

Change-Id: Ieaef2531a5f4c7bd462917d5c6a12b0095938211