Merge "[WifiSetup] Align to mac address to locale start" into mnc-dev