Merge "Update password check for WAPI" into udc-mainline-prod