Merge "Make auto Wi-Fi summary text consistent with feature availability." into oc-mr1-dev