Merge "Revert "Change averagingWindowMs to int""