Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev...
Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am: d6ee8993" into nyc-mr1-dev am: 4e8b6bfe
am: d948e39e
* commit 'd948e39e':
Delay PACKAGE_RESTARTED until after data cleared.
Change-Id: I5bf677218fe3ee19eb667f708d6220c7e82736ee