am cf054d1c: (-s ours) am f8834f87: Merge "fetch macaddr right after supplicant connection" into gingerbread

Merge commit 'cf054d1cf605d46d3b2e459c28fe4516df104a39'

* commit 'cf054d1cf605d46d3b2e459c28fe4516df104a39':
  fetch macaddr right after supplicant connection