update no_separate_recovery handling

Change-Id: Id6ac5819c740698a1819596d5962b470ad936f44