am f3238be7: am da284b54: am 952bdf80: Only set the package is the filter is not null or empty

* commit 'f3238be7a95c8b2ba73bd677bd3859af830d56a4':
  Only set the package is the filter is not null or empty