Merge "remove unused matchesCallFilter(Bundle, int)" into lmp-dev