Merge "Enable c++17 in recovery_defaults."