Fixing filtering with an empty filter

Change-Id: Ieb1257573cae88e83abf3217a31a4e1ff187eca6
Merge commit 'c9e6d75562621a3dee26a99c2b082e2fd9b0c8b3' into oxygen_4.3

* commit 'c9e6d75562621a3dee26a99c2b082e2fd9b0c8b3':
  Fixing filtering with an empty filter