Merge "sdm: config: enable hw recovery"