Merge change 5006 into donut

* changes:
  Pass the originating app's versionCode along with a restore set