Merge "Merge "health: drop backup instance for non-recovery." am: c900d6f20e am: 80d053dcb1 am: 5dadc03362 am: 84c24239f7 am: d665a05e5f"