Merge "Limit SelfRecovery wifi restarts to some amount" into oc-dr1-dev