Merge "Retry write operation when getting ENOBUFS." into oc-dev