Merge "Gracefully handle races with package uninstall" into mnc-dev