am 5f714213: am e242c731: Merge "Ensure install-during-restore is like...
am 5f714213: am e242c731: Merge "Ensure install-during-restore is like install-then-restore" into jb-mr2-dev
* commit '5f714213':
Ensure install-during-restore is like install-then-restore