Merge "Fix Error When Input Buffer is Full" into mnc-dev am: 9407b539 -s ours am: 9361fc16 -s ours am: e9e57473 -s ours Change-Id: Ieebcb2f0899abfae8d0a727e4fdcf0e8f22117aa