Merge "Fix spelling error with bm_verifier"