Merge "use more correct case condition when consume input" am: 050861f957 am: d0198af634 am: ff99040d10
am: 7c870521eb

Change-Id: I29f101ffea46907c4b446b30027334e85411d541