Backout da9a2b8a16cc (bug 844331) for breaking telemetry submission numbers; a=bajaj