[oregon] Fix resume device
Merge remote-tracking branch 'github/oregon'