Merge "Fix alignment issue with mac address in Wifi Settings"