Merge "Don't crash during app uninstall." into oc-dev
am: 661b6badef

Change-Id: Iceab4bdd88e348c4bd4019ee1fb6c7c8b3f5baf1