Update wap-demo to d84934e3