Merge "Enabling wifi on new demo session" into nyc-mr1-dev
am: d5aecac581

Change-Id: I7bd00132c8c192b499d64d509fbd7fc041aab797