Merge "Fix Error When Input Buffer is Full" into mnc-dr-dev am: 9fc878dd8f am: fdfbb92b6a am: ad4c1f9271 am: d5cea32c78
am: e2c45cfa24

Change-Id: I73f59d3f99841957118f76361f2e90de71bc58dc