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

Change-Id: I0f1cec86127397ad2a99580bba2d7e2376809c5c