Merge "Change testtag to large as tests needs to have wifi connection" into nyc-dev