Merge "Fix wp and sp comparison bugs" am: 28fdb8e282 am: 1deb957b15
am: 8dc9aeec82

Change-Id: I9179b208f7760d3ab837e28a169f8144f9666129