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

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 am: 59927784  -s ours am: d61d46f6  -s ours am: b745f2ca  -s ours am: 3e4278f1  -s ours am: d7948605  -s ours
am: 666379a6  -s ours

Change-Id: If135749672ef898ca622000d16cd702eedc29da2