Merge "Don't crash in background after app uninstall." into oc-dev
am: 74037d1287

Change-Id: I261336a0d6b729dfba31a812cfa106ffc01f9931