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

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