Instead of doing set diffing just partition when state checking

Change-Id: I1dff5b3ca5487c9318274f349e81af16b6c89015
Merge "Instead of doing set diffing just partition when state checking"