Merge "Improve Wi-Fi Settings UI in guest mode" am: 31f64a1253 am: 241d902200
am: 94854cc57b  -s ours

Change-Id: Iffe4bd1fac36c1b51748b802308b3b5dcf5ccb54