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

Change-Id: I951c0119020a2573bd1716e33454196508b51e74