Merge "Remove RunningStat compat class"