Merge "Disable recovery in PDK builds"