Merge "Change averagingWindowMs to int"