Add Filter linkage and seperate interface

Test: Manual
bug: 135708935
Change-Id: I5782a183936ffca4f345d14c353ad34210f12df7
15 files changed