Pass filter type instead of filter array

Change-Id: I25f2149ddaa332722f7ab82e8f832a253c4b6ab3
5 files changed