Merge "Fix Error When Input Buffer is Full" into mnc-dev am: 9407b539b7  -s ours am: 9361fc16b0  -s ours am: e9e57473da  -s ours
am: 94595c6fb6  -s ours

Change-Id: Ie376a92ab411fa7b0215f893385ec92ec7cedfa1