Merge "use more correct case condition when consume input"
am: 050861f957

Change-Id: I8124f5403b5d6caf9582995c10664dee118021fe