InstructionFilter needs virtual destructor (Effective C++, Item 14) Change-Id: I52422c3e8ec1c40c93cb83a0591910837efb00b5
move preparation steps into separate functions Change-Id: I4930ec38f003302596f215a08cd8bf455f525571