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

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