Merge "Add more logs for writing failures." into oc-dr1-dev