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

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