And update the channel name Change-Id: Ic4b909d31b38b9e1ee05f9b3e4e5c91efc6752b1 Fixes: 36891897 Test: manual