Merge "Refactored AsyncBlockCheckFilter to BlockCheckerFilter" am: 175c17d51f
am: 1d4becc8a8

Change-Id: I075b8e35bad40f6bbeebade9036854f0976b3ce2