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

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