Merge "Fix Error When Input Buffer is Full" into mnc-dr-dev am: 9fc878dd am: fdfbb92b am: ad4c1f92 am: d5cea32c Change-Id: I8ff10aa86be5818a18b1fd71ae2ba2313b1c3730