Merge "Refactored AsyncBlockCheckFilter to BlockCheckerFilter"
am: 175c17d51f

Change-Id: I17e042ae8d48e347c78af19a100872319738ff74