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