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

Change-Id: If55d6632efa7442dc62258444ef6e603016859d1