Merge "Do not require device provisioning to do restore-at-install" into lmp-dev