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

Change-Id: I59da74e0e43b59e0ab559cb4a35653c98b530d02