Merge "Change self recovery log level from wtf to error" into oc-mr1-dev