fwk: Use constructor feature for AutoRecovery.

Change-Id: I87a6c1c1c6dc92670dccee3f56302e7f234b281d
Forgotten git add, doh!

Change-Id: I6dccc887b400352cc47678d912b5e4d391c96a3b