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

Change-Id: Ic836022129526791703f9859653da5a5d7aeee1a