Merge "Log errno" into oc-dev