am 54f156c7: Merge change 5006 into donut

Merge commit '54f156c7c47bd5b5f2c9675f56bddaaa43ad162e'

* commit '54f156c7c47bd5b5f2c9675f56bddaaa43ad162e':
  Pass the originating app's versionCode along with a restore set