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

Change-Id: Id0c46b2669af8386792dccd12407d8de6dc66d05