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

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base