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

Change-Id: If99dc4527f2d85d803d7ef8eabfbb8601be11071