Merge "Fix statsd publicapi stub default usage" into rvc-dev