Merge "Override the csit verify stream for bier"