Merge "Revert "Revert "Fix wp and sp comparison bugs"""
am: bca89d7bbc

Change-Id: I6a0fbce87209d40ca788e7b2ba891488725ee29a