Merge "[Blocking Helper logs] Modify blocking helper to category"