Merge "Bug 1593 - Flow Statistics manager is updating store with incorrect key Statis...