Merge "Refactor code to make predicates negatable" am: 76b7493035 am: e8ac821819
am: ace32f5521

Change-Id: I200f53ed93cf348a78ebb003fe23783cd0d3aa87