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

Change-Id: I779d69edf1d02e652bd5afaf5efb45f63a7b536c