Allow alternate RECOVERY_VARIANT

Change-Id: I5b7d1ab0963b9b39aa84f3ba29d446d5e0d50e19