Merge "Added test for enabling wifi for demo user"