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

Change-Id: I3cacdd7a09e132f98f4367ced3289c3c14df9398