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

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