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

* commit '0c00c3ef23e3cc522a56f4aaa1dd623d5a0475a4':
  Using FilteredNumCompat for unblock
  Updating AsyncQueryHandler with FilteredNumCompat
  Implementing Compat class for Filtering