Merge "Fix consumer closed input channel cause an error occurred (1/2)" into rvc-dev am: 488cd2c4ff

Change-Id: I57a987db0f5e89244cf03b009298c3a2050129f3