Merge "Fix Error When Input Buffer is Full" into mnc-dev
am: 9407b539b7  -s ours

Change-Id: I133f8b3ac8211cbf0ca12205671f392054d5241b