Merge "Remove wp feature test" into mnc-dev