Merge changes from topic 'mockDelete' into nyc-dev

* changes:
  Using FilteredNumCompat for unblock
  Updating AsyncQueryHandler with FilteredNumCompat
  Implementing Compat class for Filtering