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

Change-Id: I8a6ddd19b2a31987e8448db2e07716d8ce526d0f