Merge "Make ApiStashEdit use statsd metrics"