Merge "Avoid system_server crashing due to mac address is null"