Merge "Revert "Fix wp and sp comparison bugs"" am: e61e8c6b62 am: 85178d56a4
am: 53cfb691ed

Change-Id: I20f2d2720b45c42ab4338d33cdb58c1b59052e7b