Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am: d6ee8993" into nyc-mr1-dev