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

Change-Id: Ibb111900f6667dfaafc5ae22523e2a55d3e341de