Merge "Add a default SSID prefix for local only hotspot" into oc-dev