Add extra WAP preprocessing. Independent change, but requires 69603 for effect.

Change-Id: I2e3f1b5206c368ce26a9274c80682823579b1a6a
Merge "Add extra WAP preprocessing. Independent change, but requires 69603 for effect."