Merge "recovery: Remove hard-coded SCRATCH_ADDR usage"