tree 030f32a21734d1451967806cbc1bb34f426d3b72
parent a7ba45acb1e18e654d9861ee57c0ae1e6ebfbef9
author Julia Reynolds <juliacr@google.com> 1536588315 -0400
committer Julia Reynolds <juliacr@google.com> 1536763018 -0400

Add missing synchronization

To 2 places where channels can be removed, not just marked as deleted.

Also rename a variable to remove an extraneous s.

Test: manual
Change-Id: Ic7f676499425fe54453384d7c03de5d95c03a713
Fixes: 113036956