Unhide filter event part 2

Test: make;
Bug: 139308734
Change-Id: Ic7897300f14ddd39381e363198bc8c39ce497a29
10 files changed