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