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

Change-Id: Ia69d75f699a05c8ffa0a0efa8a88bd5868ca074e