Merge "Add test config to statsd_test and apply mainline module" into rvc-dev am: 3079748d am: 62ad905e Change-Id: I2e43408930cd5b9fa1f9b08c331e759673833c20