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

Change-Id: Id592242b07588c50a743c5b53eaecaca44b7acbb