Merge "Make framework-statsd stubs use the new defaults" into rvc-dev