Merge "WifiConfigStore: Remove legacy modules" into oc-mr1-dev