Update wap-demo to b510650a