Merge "Remove broadcast cuj events logic"