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

Change-Id: Ica177880f5de4d981a9c3e873ef05591b1455c3b