Merge "Bug 781: Statistics manager is throwing IllegalStateException"