Turning recovery off by default

Change-Id: Iac3e7c108ed1504bce798403fdc2707fe96b6008
Merge "Turning recovery off by default"