Merge "Fix crash from WPS" into mnc-dev