am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore

* commit 'fcfc99c064f0b91fa419784bd90bb9944b9ab9f4':
  Ensure install-during-restore is like install-then-restore