Merge "Fix wifi network strings shown in Settings." into mnc-dev