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

Change-Id: I90be9f94fcca739c7e1846fe1fa0b3fc264f7bc0