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

Change-Id: I86850ea0a77e4b640551129dd2fa2eadea81c1d6