Merge "Avoid creating verified methods for non quickening filters" am: e77d1240a2
am: cc2f575d53

Change-Id: I32418e41d1df9e7add28e585b916b051e7e3d88c