Merge "Updated summary logic for wifi" into nyc-mr1-dev