Merge "Add a default SSID prefix for local only hotspot" am: e98a2942a4 am: 6fc5051613 am: 2f7a169618
am: 01d3ad5cf2

Change-Id: Ifa2af8e64e0fa7e9d3033aef303872c3de5dd617