Merge "Change recovery to static platform-only compilation." into oc-dev