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

Change-Id: I79f4efd61092646df9ea282754fad92a4cd9f093