Merge "L5 metrics are not getting reset"