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

Change-Id: I068081a3c213f5b603dc4e1881c4fecbb3e0b3c3