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

Change-Id: I8703b838c83a71f5be27d07e1a514bf4c8d22a17