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

Change-Id: I365fb0b25e02f76c32a05217d98112a4c3241a4e