Merge changes from topic \'mockDelete\' into nyc-dev am: 0c00c3ef23
am: 807017f199

* commit '807017f1994cc958ce85d0422de3560a6ba38a1d':
  Using FilteredNumCompat for unblock
  Updating AsyncQueryHandler with FilteredNumCompat
  Implementing Compat class for Filtering