Merge "Fix wp and sp comparison bugs"
am: 28fdb8e282

Change-Id: If5eae1a7d63c284dc2d4eaf522e04ca8ddde1ca5