Merge "Add feature flag for statsd wifilock tests" into pi-dev