Merge "Disable recovery in PDK builds" into klp-volantis-dev