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

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