am c584a24b: am 2140d1de: Merge "Avoid system_server crashing due to mac address is null"

* commit 'c584a24ba1af0c831adf46fe57b69af396fb925c':
  Avoid system_server crashing due to mac address is null