Merge "Use option to flush the entire buffer on -EOVERFLOW" into oc-dev am: 4bba89e4e1
am: c5cb6b35a6

Change-Id: I2b62bfaad94bad8dec9c0e652fa8db8050dd32af