Merge "change log recovery to generic device_recovery_start function"