Merge "Add test config to statsd_test and apply mainline module" into rvc-dev